Adwaita: really fix solid-csd

add a specificity bump hack in the titlebar solid-csd styling to
avoid being overridden by the split titlebar theme logic.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index ed7c82a2dd9c7e576c82e65a2b4a715f97454b1e..4833bd405f037581febc7086a0e5870321ce3d94 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1512,11 +1512,13 @@ headerbar {
 
   .solid-csd & {
     &:backdrop, & {
-      margin-left: -1px;
-      margin-right: -1px;
-      margin-top: -1px;
-      border-radius: 0;
-      box-shadow: none;
+      &:dir(rtl), &:dir(ltr) { // specificity bump
+        margin-left: -1px;
+        margin-right: -1px;
+        margin-top: -1px;
+        border-radius: 0;
+        box-shadow: none;
+      }
     }
   }
 }

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index e159f508d8ef6033aaadfa539517e2341c18a99b..4e647dbd36b238a3e691188229c16d5a56aaa441 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1929,9 +1929,11 @@ headerbar {
       min-width: 26px;
       margin: 0;
       padding: 0; }
-  .solid-csd .titlebar:backdrop:not(headerbar), .solid-csd .titlebar:not(headerbar), .solid-csd
-  headerbar:backdrop, .solid-csd
-  headerbar {
+  .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd
+  headerbar:backdrop:dir(rtl), .solid-csd
+  headerbar:backdrop:dir(ltr), .solid-csd
+  headerbar:dir(rtl), .solid-csd
+  headerbar:dir(ltr) {
     margin-left: -1px;
     margin-right: -1px;
     margin-top: -1px;

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c8496e80ec5e77e26ddb84e9476c8f686530b9bf..048cd891884abc5feca1a4478dac751c37bc70c0 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1936,9 +1936,11 @@ headerbar {
       min-width: 26px;
       margin: 0;
       padding: 0; }
-  .solid-csd .titlebar:backdrop:not(headerbar), .solid-csd .titlebar:not(headerbar), .solid-csd
-  headerbar:backdrop, .solid-csd
-  headerbar {
+  .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd
+  headerbar:backdrop:dir(rtl), .solid-csd
+  headerbar:backdrop:dir(ltr), .solid-csd
+  headerbar:dir(rtl), .solid-csd
+  headerbar:dir(ltr) {
     margin-left: -1px;
     margin-right: -1px;
     margin-top: -1px;